From: Chad Horohoe <demon@users.mediawiki.org>
Date: Sat, 15 Aug 2009 20:56:11 +0000 (+0000)
Subject: When running PHP from the command line the default setting is 0...except when it... 
X-Git-Tag: 1.31.0-rc.0~40286
X-Git-Url: http://git.cyclocoop.org/%27%20.%20%24prefix%20.%20Wiki::transformTitleToURI%28%24matches%5B1%5D%29%20.%20%27?a=commitdiff_plain;h=b629a66feded61aafe2e535f4ba51fc2fce4726d;p=lhc%2Fweb%2Fwiklou.git

When running PHP from the command line the default setting is 0...except when it's not.
---

diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index ba59b98e8a..1d2d115c08 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -327,6 +327,11 @@ abstract class Maintenance {
 		# Set the memory limit
 		ini_set( 'memory_limit', -1 );
 
+		# Set max execution time to 0 (no limit). PHP.net says that
+		# "When running PHP from the command line the default setting is 0."
+		# But sometimes this doesn't seem to be the case.
+		ini_set( 'max_execution_time', 0 );
+
 		$wgRequestTime = microtime( true );
 
 		# Define us as being in MediaWiki